Fix GTK build
authorPo Lu <luangruo@yahoo.com>
Thu, 7 Jul 2022 12:16:43 +0000 (20:16 +0800)
committerPo Lu <luangruo@yahoo.com>
Thu, 7 Jul 2022 12:16:43 +0000 (20:16 +0800)
* src/xterm.c (x_dnd_begin_drag_and_drop): Update GTK quitting
code for last change too.  Reported by Norbert Koch
<viteno@netic.de>.

src/xterm.c

index 98a5beed1780fdc26358dafa401e2e48ca2b3e35..d057bbf06c2186476231532567f48521dc2c7db5 100644 (file)
@@ -11889,55 +11889,10 @@ x_dnd_begin_drag_and_drop (struct frame *f, Time time, Atom xaction,
          if (xg_pending_quit_event.kind != NO_EVENT)
            {
              xg_pending_quit_event.kind = NO_EVENT;
-
-             if (x_dnd_in_progress)
-               {
-                 if (x_dnd_last_seen_window != None
-                     && x_dnd_last_protocol_version != -1)
-                   x_dnd_send_leave (f, x_dnd_last_seen_window);
-                 else if (x_dnd_last_seen_window != None
-                          && !XM_DRAG_STYLE_IS_DROP_ONLY (x_dnd_last_motif_style)
-                          && x_dnd_last_motif_style != XM_DRAG_STYLE_NONE
-                          && x_dnd_motif_setup_p)
-                   {
-                     dmsg.reason = XM_DRAG_REASON (XM_DRAG_ORIGINATOR_INITIATOR,
-                                                   XM_DRAG_REASON_DROP_START);
-                     dmsg.byte_order = XM_BYTE_ORDER_CUR_FIRST;
-                     dmsg.timestamp = xg_pending_quit_event.timestamp;
-                     dmsg.side_effects
-                       = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (FRAME_DISPLAY_INFO (f),
-                                                                          x_dnd_wanted_action),
-                                              XM_DROP_SITE_VALID, x_dnd_motif_operations,
-                                              XM_DROP_ACTION_DROP_CANCEL);
-                     dmsg.x = 0;
-                     dmsg.y = 0;
-                     dmsg.index_atom = x_dnd_motif_atom;
-                     dmsg.source_window = FRAME_X_WINDOW (f);
-
-                     x_dnd_send_xm_leave_for_drop (FRAME_DISPLAY_INFO (f), f,
-                                                   x_dnd_last_seen_window,
-                                                   xg_pending_quit_event.timestamp);
-                     xm_send_drop_message (FRAME_DISPLAY_INFO (f), FRAME_X_WINDOW (f),
-                                           x_dnd_last_seen_window, &dmsg);
-                   }
-
-                 x_dnd_end_window = x_dnd_last_seen_window;
-                 x_dnd_last_seen_window = None;
-                 x_dnd_last_seen_toplevel = None;
-                 x_dnd_in_progress = false;
-                 x_dnd_frame = NULL;
-               }
-
-             x_dnd_waiting_for_finish = false;
-             x_dnd_return_frame_object = NULL;
-             x_dnd_movement_frame = NULL;
-
-             FRAME_DISPLAY_INFO (f)->grabbed = 0;
              current_hold_quit = NULL;
 
-             /* Restore the old event mask.  */
+             x_dnd_process_quit (f, FRAME_DISPLAY_INFO (f)->last_user_time);
              x_restore_events_after_dnd (f, &root_window_attrs);
-
              quit ();
            }
 #else